Minor optimization tweaks
Deleted unwanted files