Removed some ghost code
merge fix