Some unfinished code is now removed