Code clean-up completed for now