Small cleanups. Removed upstreamed patch. Suffixed all patches with .patch Signed-off-by: Rosen Penev <rosenp@gmail.com>