Removing unfinished code