Removed Rewrites

- Cleaned up code slightly
- Removed Rewrite (temporally; it's causing issues)