Just code cleanup, deleted some outcommented code