Removed comments and old code