Removed all unnecessary