More fixes. Remove unused code
Version 1.1.3