removed unfinished stuff