Clean, clean, clean!
 - Cleaned the code as much as possible
 - Removed unused References

Signed-off-by: RoachxD <roachxxxx@gmail.com>