Removed unnecessary custom code