Core: Removed unwanted stuff!