fixes and further removal