changed default bpm and removed dead code