removed debug and play-around stuff