Various code cleanup

- Getting rid of obselete an redundant code
- flak is now carpet