Some Changes
Deleted stuff