Clean-ups; unnecessary patch was removed
Code clean-ups