Cleanup

Delete dat redundant code