Some cleanup

@mereskin