cleaned up unused code
merged