Further cleanup

Delete unuse code