Updated for v1.0.3
Removed things that don't belong here