Remove spare parts
Add cifs module
Fix extra init.rc file
More fixups for mako