Feature/312 future usage cleanup