Cleaned up code

Content of methods removed. Preparing brand new revision.