cleanup as hell - i hope everything still works