Version 20140617

Removed some nonsense code remarks