more cleanup

removing more remarked code, unneeded vars
cleanup

more cleanup, changed return value of buildEntity to void