housekeeping, deleted all unecessary stuff due to last update