Removed some rubish..