Some internal jokes removed

Some internal jokes removed
Block of commented code removed