Cleanup some code before the coming changes