Removed unfinished/unwanted classes