cleaned up old comments and code