Some code cleanup to get rid of unnecessary lines/files