Removed custom code and a TODO