Removing hack and cleaning