Did some cleaning, removed unused files