Removed brakeman. Resolved dep conflicts