removed debug statements
cleaned import
fixed for after merge
removed unused code