cleaning up unnecessary sourcecode