Deleted stuff and optimized