Fiddling around with stupid comments and obsolete code