Got rid of non-compiling code