Cleaned up code and removed unused method as well as redirect to block that uses trailing slash