Remove old source file
Update Makefile & cleanup