Removed some of the unique stuff