Clean #1 : Remove unnecessary files and some code cleanup