Removed several redundant methods.
Removed old files.
Merge branch 'andrew'