Commented out all obsolete Stuff