removed tons of commented methods