Remove clone method, fix Android Lint bugs. Refs #292