Removed un-needed components