Clean up comments, deprecated one of the methods