Removed some useless functionality