Removed unneded functionality