removed some blaat code