1. Remove un-used source code
 2. New Makefile