Removed unused code, changed calls