removed unfinished stuff from develop branch