Fixing few issues and removing unnecessary files