Reduced checks to required minimum, =/= handling, massive cleanup required