Cleaned comments and old methods