Optimizing some unnecessary methods