FIX: General cleanup