Revove some code