Removed all unnecessary features