Cleaned up after the none destructive merge.. Sry for all the useless commits -Felix