Fixed some issues when merging. Removed unecessary methods and attributes