Code cleanup

Got rid of some annoying lines that were useless.