fix access modifiers and remove unused resources