Small changes. AH-290
Removed some code. AH-290