Commented out some things I shouldn't have been using anyway.