First Commit, fixed

Removed some obsolete code and make something, you break something,
haha!