Removed some unfinished code