Removed potentially confusing stuff