Fixed using block ID's and removed obselete code