Cleaned up the code base.. removed redundant files..