Removed unfinished functions