Remove unused files, cleanup code etc...