Removing unused (and wrong) method
Minor optimizations