Code cleanup

Yeah, good point. Will remove all those.