Removed some previoulsy accidentely commited unused code