Fixed Error "null call", removed unused code (will be back later)